remove now unused arg variables.

Tue Sep 21 16:27:19 2004  Manish Singh  <yosh@gimp.org>

        * gdk/gdk.c: remove now unused arg variables.

        * gdk/gdkinternals.h: declare _gdk_windowing_init ().

        * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args ()
        here instead of gdk_pre_parse_libgtk_only (). Should fix #153082.

diff --git a/ChangeLog b/ChangeLog
index ba42d4eecabe04d42825595a4011f6b13c886b1a..9868d769d447748830dbb7b53d2dd198c7e8f389 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Sep 21 16:27:19 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/gdk.c: remove now unused arg variables.
+
+       * gdk/gdkinternals.h: declare _gdk_windowing_init ().
+
+       * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args ()
+       here instead of gdk_pre_parse_libgtk_only (). Should fix #153082.
+
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ba42d4eecabe04d42825595a4011f6b13c886b1a..9868d769d447748830dbb7b53d2dd198c7e8f389 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Tue Sep 21 16:27:19 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/gdk.c: remove now unused arg variables.
+
+       * gdk/gdkinternals.h: declare _gdk_windowing_init ().
+
+       * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args ()
+       here instead of gdk_pre_parse_libgtk_only (). Should fix #153082.
+
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ba42d4eecabe04d42825595a4011f6b13c886b1a..9868d769d447748830dbb7b53d2dd198c7e8f389 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Tue Sep 21 16:27:19 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/gdk.c: remove now unused arg variables.
+
+       * gdk/gdkinternals.h: declare _gdk_windowing_init ().
+
+       * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args ()
+       here instead of gdk_pre_parse_libgtk_only (). Should fix #153082.
+
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ba42d4eecabe04d42825595a4011f6b13c886b1a..9868d769d447748830dbb7b53d2dd198c7e8f389 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Tue Sep 21 16:27:19 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk/gdk.c: remove now unused arg variables.
+
+       * gdk/gdkinternals.h: declare _gdk_windowing_init ().
+
+       * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args ()
+       here instead of gdk_pre_parse_libgtk_only (). Should fix #153082.
+
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): 

diff --git a/gdk/gdk.c b/gdk/gdk.c
index c1c30b2f0d73340855fc35caff0aec06eec5d3ec..7af44a573485d91f083ff814ea5b497cfb29f238 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -53,8 +53,6 @@ static int gdk_initialized = 0;                           /* 1 if the library is initialized,
                                                     */
 
 static gchar  *gdk_progclass = NULL;
-static gint    gdk_argc = 0;
-static gchar **gdk_argv = NULL;
 
 #ifdef G_ENABLE_DEBUG
 static const GDebugKey gdk_debug_keys[] = {

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 1b3ccb4de21283b7ba5ec69b4e5838b56c18f70e..b9e14eba46650e1dcd1f0c4b36a469ea30a8ee56 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -238,6 +238,8 @@ void _gdk_colormap_real_destroy (GdkColormap *colormap);
 
 void _gdk_cursor_destroy (GdkCursor *cursor);
 
+void     _gdk_windowing_init                    (void);
+
 extern GOptionEntry _gdk_windowing_args[];
 void     _gdk_windowing_set_default_display     (GdkDisplay *display);
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 529600be506dc9f06174338a8b71df68580c8465..8a7ef3358897d569a83444fdaa0a2e7d28a2d162 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -437,7 +437,7 @@ do_pre_parse_initialization (int    *argc,
        g_warning ("Locale not supported by C library.\n\tUsing the fallback 'C' locale.");
     }
 
-  gdk_pre_parse_libgtk_only ();
+  gdk_parse_args (argc, argv);
   gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL);
   
 #ifdef G_ENABLE_DEBUG